Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 08:57:47 +0000 (00:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 08:57:47 +0000 (00:57 -0800)
commit61802c7ec4524843a0398956bbb54d647b5b26ff
tree759ab7640215f904320357831d9d0394c3787ed3
parent1e9847276c3ce48d6147276dac979001c2edddfc
parent0da68e28696cc019747a7bbebdc3b38505e6e9d9
Merge from trunk.